From 5f8af6d910801b52f95b07f0a9d900f051b406a6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 11 Jun 2008 03:36:32 +0000 Subject: [PATCH] =?utf8?q?=20=20=20=20=20=20=20=20Bug=20536765=20=E2=80=93?= =?utf8?q?=20GtkComboBox=20should=20set=20COMBO=20type=20hint=20for=20its?= =?utf8?q?=20menu?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * gtk/gtkoptionmenu.c: * gtk/gtkcombobox.c: Set the window type hint on popups. Patch by Danny Baumann svn path=/trunk/; revision=20351 --- ChangeLog | 10 +++++++++- gtk/gtkcombobox.c | 3 +++ gtk/gtkoptionmenu.c | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9e7cf10e10..bb1101348d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,12 @@ -2008-06-10 Christian Persch +2008-06-10 Matthias Clasen + + Bug 536765 – GtkComboBox should set COMBO type hint for its menu + + * gtk/gtkoptionmenu.c: + * gtk/gtkcombobox.c: Set the window type hint on popups. + Patch by Danny Baumann + +2008-06-10 Matthias Clasen * gtk/gtkfilesystem.c (get_icon_for_special_directory): (gtk_file_system_volume_render_icon): Add standard icon names, diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 3db35f2431..8d5c12e152 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1575,6 +1575,9 @@ gtk_combo_box_menu_position (GtkMenu *menu, gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data); } + + gtk_window_set_type_hint (GTK_MENU (priv->popup_widget)->toplevel, + GDK_WINDOW_TYPE_HINT_COMBO); } static void diff --git a/gtk/gtkoptionmenu.c b/gtk/gtkoptionmenu.c index 272017bf61..d36816c265 100644 --- a/gtk/gtkoptionmenu.c +++ b/gtk/gtkoptionmenu.c @@ -894,6 +894,10 @@ gtk_option_menu_position (GtkMenu *menu, active = gtk_menu_get_active (GTK_MENU (option_menu->menu)); gdk_window_get_origin (widget->window, &menu_xpos, &menu_ypos); + /* set combo box type hint for menu popup */ + gtk_window_set_type_hint (GTK_MENU (option_menu->menu)->toplevel, + GDK_WINDOW_TYPE_HINT_COMBO); + menu_xpos += widget->allocation.x; menu_ypos += widget->allocation.y + widget->allocation.height / 2 - 2; -- 2.30.2